fix(core): prevent re-entrant deadlock in SegmentDestination.cleanupUploads#444
Open
sean-fubotv wants to merge 1 commit into
Open
fix(core): prevent re-entrant deadlock in SegmentDestination.cleanupUploads#444sean-fubotv wants to merge 1 commit into
sean-fubotv wants to merge 1 commit into
Conversation
…ploads Collect per-upload cleanup closures inside the uploadsQueue.sync block and invoke them after the lock is released. Previously, cleanup and analytics?.log ran while the serial queue was held, which could trap with EXC_BAD_INSTRUCTION if any callee re-entered uploadsQueue.sync (e.g. via pendingUploads, add(uploadTask:), or another cleanupUploads call from a URLSession completion). Adds SegmentDestination_Tests covering: non-running task removal, running task retention, re-entrant cleanup safety, and concurrent add/cleanup access. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For issue: #443
• Bug: SegmentDestination.cleanupUploads() invoked each upload's cleanup closure and analytics?.log(...) inside the uploadsQueue.sync block. If any callee re-entered a queue accessor (pendingUploads, add(uploadTask:), or another cleanupUploads() — realistic given URLSession completion callbacks and logger plugins), the serial queue would trap with EXC_BAD_INSTRUCTION.
• Fix (Sources/Segment/Plugins/SegmentDestination.swift): collect cleanup closures under the lock, then run them after the lock is released.
• Tests (Tests/Segment-Tests/SegmentDestination_Tests.swift, new file, 4 tests, all passing): non-running removal + cleanup fires, running task retention, re-entrant cleanup safety, concurrent add+cleanup stress.